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