Visibility fix
Merge remote-tracking branch 'origin/visibility_private_fix' into build-24