Merge stable into develop

Merged
IN
10d ago
+12-0

Merging stable into develop after merging pull request #1422.