Merge branch 'topic/for-asoc'