FrankSu: This is for master branch.