issue #21836: Be sensitive to public flag.