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