Merge remote-tracking branch 'origin/pr/572' into baremetal