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