Merge "Fix Squashing Issue on UMO Background" into tm-dev