Merge "Better handle op size edge cases"