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