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