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