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