Test file for issue #7202 - upward merge test
