Merge remote-tracking branch 'spi/topic/img-spfi' into spi-next