Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/of', 'regul...