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