Merge branch 'fix/asoc' into fix/misc