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