Update to 71fe44def9676d519f5ce5d7304e581a42cf2c70 for Josh's SM upgrade