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