[REVIEW + IMP] change behavior to use criteria when export to CMMS + Review
[MERGE] with master-jri