Merge remote-tracking branch 'security/QA_4_7-security' into QA_4_7-security