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