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