Merge branch '4.1.0' into CAKE-222-fix-fee-picker-on-the-settings-screen

OleksandrSobol committed Jan 8, 2021 at 17:38 UTC 0e721b7795cedcd958285cc7f60c3a2ccf8267c8

No changes.