Merge branch 'master' into develop

Status Job ID Name Coverage
  Build
canceled #581
appimage

canceled #580
appimage