Merge branch 'fix-bug-criteria-json' into 'develop'

fixed bug => DONE

See merge request !37
3 jobs for develop in 7 minutes and 38 seconds (queued for 7 seconds)