KRACOEUS-7369: fixing common and PD annotations

I tried that and our int tests failed.  I couldn't figure out why so I left it for now.