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