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