Merge remote-tracking branch 'spi-nor/spi-nor/next'