fix to enable client-specified nonce count (NC), port #786 on master