Merge "Snap for 5053079 from 822c008d7b99ad68aec50af30b03280479745586 to pi-qpr2-release" into pi-qpr2-release