Merge pull request #1202 from living180/no_channel_parent