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