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