QA-6439 : port of 1_x commits to master