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