Merge existing fixes from spi/for-6.6 into new branch