diff --git a/doc/release-notes.md b/doc/release-notes.md
index 4a9d31f2a..835d95c40 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,13 +1,19 @@
Bitcoin ABC version 0.21.13 is now available from:
This release includes the following features and fixes:
+RPC changes
+-----------
+`createwallet` now returns a warning if an empty string is used as an encryption password, and does not encrypt the wallet, instead of raising an error.
+This makes it easier to disable encryption but also specify other options when using the `bitcoin-cli` tool.
+
Low-level changes
=================
Tests
---
- `-fallbackfee` was 0 (disabled) by default for the main chain, but 20000 by default for the test chains. Now it is 0 by default for all chains. Testnet and regtest users will have to add fallbackfee=20000 to their configuration if they weren't setting it and they want it to keep working like before. (#16524)
+
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index d56a30560..17c7c1ac6 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -1,4731 +1,4738 @@
// Copyright (c) 2010 Satoshi Nakamoto
// Copyright (c) 2009-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include
#include // for GetConsensus.
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include
#include