JPF-231 Fix import of D367451248