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