Merge branch 'regulator-5.1' into regulator-next