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