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