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