Merge "Fix two intrinsic clipping bugs." into lmp-dev