Merge "Add an implementation defined limit on number of keys in CSR"