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