Pull changes from absingla/core/master to absingla/core/sm