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