Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier...