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