Improved path inclusion.
Environment cleanup.
Merge branch 'jmmut-feature/cplusplus' into develop