Merge remote-tracking branch 'origin/bug_785_fix_rtl_group_epg'