Merge branch 'asoc-5.4' into asoc-5.5