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