Merge branch 'revert-1259b0fe' into 'master'

Revert "Merge branch 'staging' into 'master'"

See merge request !400
3 jobs for 412-deleting-a-session-with-no-description-crashes-app
in 8 minutes and 49 seconds and was queued for 2 seconds