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