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