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