Add "TESTCSP-REGISTRY" and fix the order of combination index keys
Merge branch 'singledb'