Manually merge

Status Job ID Name Coverage
  Build
manual #3764
ISO allowed to fail manual
build_iso
 
  Deploy Testing
manual #3765
rsync allowed to fail manual
deploy_testing