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