Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup