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