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