BPHY12: Bring in code from 21.2
This doesn't actually work until the metadata base class is fixed but it should have been brought in sooner from 21.2
This doesn't actually work until the metadata base class is fixed but it should have been brought in sooner from 21.2