Merge "Fix complex clipping on mergeable ops"