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