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