Merge "Remove conditional vndbinder usage in CAS."