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