Add test for empty inclusion
cleaned up some debugging noise
Merge remote branch 'wagn/develop' into develop
Merge branch 'develop' into action_events
Fix after merge