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