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