Merge "Fix issue with Champ startup"