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