Merge branch 'dev' into 'imap-readonly'

3 jobs for imap-readonly in 1 minute and 40 seconds (queued for 1 second)