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