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