Merge "Snap for 7066328 from e832389844fa6c077419d385a587f76392ab5d11 to rvc-d2-release" into rvc-d2-release