Merge branch 'master' into yingyi/fullstack_fix