Merge "Make archive metadata idempotent" into lmp-dev