Merge branch 'topic/fix/asoc' into topic/asoc