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