Merge branch 'master' into micropeak-logging