Merge "Fix performance of clip" into main