Merge branch 'master_5700' into 'master'

Merge upstream K-9 5.700

See merge request !3
2 jobs for master
in 6 minutes and 8 seconds, using 0 compute credits, and was queued for 0 seconds