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