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