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