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