Merge branch 'refactor' into 'master'

fix settings_local

See merge request !589
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed continuous-integration/drone/pr