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