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