Feature/epg 34340