Reassign zero key values. SHOP-4679

Falk@JTL requested to merge SHOP-4679a into master Nov 23, 2020