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