Now the mojio client sends through the optional criteria
Merge branch 'feature/grantb/diagnostics' into develop