Merge stable into develop

Merged
IN
4d ago
+3-3

Merging stable into develop after merging pull request #1530.