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