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