Fix warning
Fix comment
Merge branch 'master' into master_with_coverage