Merge branch 'fix/asoc' into topic/asoc