[#3134] Trying to clarify the purpose of the nonce logic