Pull changes from absingla/master to absingla/sm