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