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