Merge remote-tracking branch 'origin/pending-merge/linux'