Merge stable into develop

Merged
IN
2d ago
+1736-60

Merging stable into develop after merging pull request #1456.