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