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