criteria order
Merge branch 'develop' of github.com:simbiotica/global-integrity into develop