added new include path structure support
Merge remote-tracking branch 'origin/alpha' into alpha