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