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