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