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