Merge "Fix CAS argument type." into lmp-dev