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