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