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