merge develop changes to 4.6 branch
This will create a new commit in order to revert the existing changes.
