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