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