Merge remote-tracking branch 'public/pr/2957' into baremetal