Issue #8065 by tuj: Text corrected.
Fixed merge