Merge "Add argument to binder call to check key types" into klp-dev