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