Merge remote-tracking branches 'spi/fix/qup' and 'spi/fix/topcliff-pch' into spi...