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