[Fix] Fix publc to public
Merge branch 'master' into develop