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