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