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