Merge remote-tracking branch 'origin/third-party-review'