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