Merge "Fix merged operation clipping" into klp-dev