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