Merge "Snap for 7066328 from 53fd072329547b00e26b92d0528eda7fa8d7c974 to rvc-qpr3-release" into rvc-qpr3-release