Merge stable into develop

Merged
IN
7d ago
+63-22

Merging stable into develop after merging pull request #1523.