CBSCR-145: rework from QA.