Merge branch 'sandbox/wangzhiqiang/als2019' into sandbox/wangzhiqiang/hss-bug