Merge remote-tracking branch 'origin/micropeak-logging'