fix search order of contains condition string
Merge branch 'release-2.4.0' into designst-fix-condition-contains
Merge branch 'designst-fix-condition-contains' into release-2.4.0
commit credits