Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof