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