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