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