[non-BE] Adds several fixes to HBR MASA metadata path. Addresses issues 438 and 477 as well.

• Related issues: #438 (closed) and #477 (closed)
• Requested reviewers: @vasilache

Description

Adds fixes to HBR MASA metadata path which were noticed during fixing issue #438 (closed). Non-BE for HBR path.