[COMMIT] Baremetal environment