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