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