Merge pull request #772 from ariard/2021-01-getting-project-context