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