Merge commit 'origin/jg/tree_context'