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