Merge stable into develop

Merged
IN
8d ago
+109-6

Merging stable into develop after merging pull request #1504.