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