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