Merge remote-tracking branch 'mghilaci/feature/project-support' into feature/project-support
Fix missing macro import
Remove jinja url resolver style
Support Thread Integration - Work in progress