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