Merge branch 'master' into '716-CRASH_EDIT_PERIOD_MAIL'

# Conflicts:
#   CHANGELOG.md
6 jobs for !424 with 716-CRASH_EDIT_PERIOD_MAIL in 17 minutes and 14 seconds (queued for 2 seconds)
latest merge request