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