i125349 moved clip enhancements to base clipping functionality