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