Merge remote-tracking branch 'asoc/for-4.19' into asoc-4.20