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