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