Merge "Fix metadata initialization"