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