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