Merge "Fix binderValueTypeTest" into oc-dev