Merge "Implement automatic SV clipping" into main