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