Merge branch 'release/2.21.1' into develop

3 jobs for 59-persistent-widgets in 0 seconds (queued for 11 seconds)