Fix a test
Fix coding style
Merge branch 'master' into checkpoint
Fix coding style