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