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