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