Merge "Create champ key index on startup"