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