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