Merge branch 'QA_4_9' into QA_4_9-security