BAC-949: merge patch for 1.19.8