Merge remote-tracking branch 'public/pr/2641' into HEAD