QA-6481: fix merge 1_x to master