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