Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass',...