Merge "Snap for 4866033 from 9deea586ea9b314fb5577bbd01fb5bffc8455e2a to pi-dr1-release" into pi-dr1-release