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