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