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