Merge commit 'bdc28f20f4' into QA_5_0