Merge remote-tracking branch 'asoc/topic/log' into asoc-next