Merge stable into develop

Merged
IN
4d ago
+3-25

Merging stable into develop after merging pull request #1528.