Cherry picks baremetal fix

Yan Sushchynski [EPAM/GC]requested to merge
cherry-picks-baremetal-fix into release/0.24

Original MRs: !142 (merged) & !143 (merged)

Edited by David Diederich

Merge request reports