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