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