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