Pull changes from absingla/third-party/master to absingla/third-party/sm