Fixed comment and function names mix-up
Merge branch 'release' into core-pr-3