Merge stable into develop

Merged
IN
7d ago
+3951-7002

Merging stable into develop after merging pull request #1490.