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