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