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