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