10Min nonce
Prevent double encoding
Merge remote-tracking branch 'origin/master'