Merge existing fixes from regulator/for-5.12