Merge remote-tracking branch 'regulator/topic/stub' into regulator-next