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