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