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