BAC-486: merge 1.19.7 changes