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