Merge "[Champ] Fix startup issue"