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