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