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