non-public leakage fix
Merge branch 'hotfix-non-public' into develop