turn strict file checking on
fix merge conflict
Merge branch 'master' into strict_file_checking
Merge branch 'master' into strict_file_checking
Merge branch 'master' into strict_file_checking
Merge branch 'master' into strict_file_checking