Merge branch 'release-4.2.4' into CAKE-343-subaddresses-for-contact-book

M committed Jul 22, 2021 at 10:36 UTC ee9aa8198da686b34f005e3f0542b3b716b04379

No changes.