using generator expression instead of location property.
using native filepath when possible.
Merge remote-tracking branch 'remotes/origin/devel' into test
fixing build scripts for ProjectC test