Merge existing fixes from asoc/for-5.10