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