Merge branch 'regulator-5.3' into regulator-5.4