Merge "Fix corner clipping on UMO" into tm-dev