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