Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub'...