Add non-default repair nonce values (#16512)