fix: makes keyed each blocks consistent between dev and prod#10500