Cherry Pick: Implement Channel Groups
up Frodo addon version to 0.1.93