harmonized with nonce changes in core