Merge "Add contains condition support to cps-path"