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