[3rd-party feeds] Correction
[3rd-party plugins] Update
Merge remote-tracking branch 'upstream/2.2' into 2.2