1014827: Fixing unit_key and unit_metadata