Merge branch 'hotfix/public-method-return'
fix
Merge branch 'master' into develop