Merge branch 'hang-fix' into jason_fill_content