Working on onMissingInclude logic
Merge branch 'develop'