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