Merge branch 'topic/asoc' into to-push