UberPOV revision #6094