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