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