Merge branch 'fix-autosave' into 'master'

Fix autosave

See merge request !31
2 jobs for master in 18 minutes and 55 seconds
Status Name Job ID Coverage
  Test
passed test:7.0 #12921

00:13:09

passed test:7.1 #12922

00:14:06