Merge branch 'yingyi/asterix_fix'