Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict