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