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