BPP-9894 @PackagePrivate detection upgraded