Closes #1516 (closed)
Patch should also be cherry-picked to develop
This will create a new commit in order to revert the existing changes.
