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