Merge nonce fix from 2.4.2