Merge branch 'loading-and-errors' into 'master'

Loading and errors

See merge request !20
2 jobs for master
in 3 minutes and 39 seconds and was queued for 1 second