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