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