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