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