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