Merge changes from topics 'baremetal-noha', 'move-maas-classes'