fixing heartbeat for channel group
fixing typo
merged from branch