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