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