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