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