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