Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a