Merge restyle branch.