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