This is adding two merges from 21.2, !27608 (merged) and !28101 (merged). They add some flexibility to the b-tagging NNs.