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