Listing sub programs for events filters
Merge branch 'Develop' into Aaron