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