Merge branch 'context-and-rewriter-sources' into develop