Merge pull request 'Local context building blocks' (#64) from local-c…

Merge pull request 'Local context building blocks' (#64) from local-c… #238