Merge stable into develop

Merged
IN
7h ago
+3-3

Merging stable into develop after merging pull request #1499.