Merge branch 'csh_fixes' into 'master'

csh fixes

See merge request !4
2 jobs for 1.0.5 in 1 minute and 32 seconds (queued for 2 seconds)
latest
Status Name Job ID Coverage
  Package
passed pack-rpm #3537677

00:01:03

 
  Deploy
passed deploy-rpm #3537678

00:00:28