merged
mentioned in commit 65463816
This will create a new commit in order to revert the existing changes.
