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