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