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