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