PR #366 from Jian-Long Huang: to next-stable
merge next-stable
pack scripts