QA-6439 : backport of 1_x commits