sample loader fix
fix javadocs parameter
Merge branch 'master' into public-cloud