UNCLASSIFIED

Merge branch 'update-6.0.4' into 'development'

Update to 6.0.4 release

See merge request !3
3 jobs for development
Status Job ID Name Coverage
  External
passed build

failed VAT

passed build