EHO-475 to XLSX
EHO-475 wrapped user criteria
Merge branch 'feature/EHO-475-XLSX' into develop