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