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