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