Merge changes from topic 'baremetal-noha'