Merge branch 'regulator-4.21' into regulator-5.0