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