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