Merge "Add <,> operators support to cps-path"