Merge branch 'asset-fixing' into 'testing'

Asset fixing

See merge request !7
1 job for testing in 14 seconds (queued for 1 second)
Status Name Job ID Coverage
  Deploy
passed devel #6980
testing

00:00:14