Merge stable into develop

Merged
IN
8d ago
+6-0

Merging stable into develop after merging pull request #1513.