PIM-3312: avoid BC breaks