Merge stable into develop
Merged
IN
7d ago+3951+3951+0123456789012345678901234567890123456789-7002-7002-0123456789012345678901234567890123456789
Merging stable into develop after merging pull request #1490.
Merging stable into develop after merging pull request #1490.