Merge "SourceContext improvements" into feature/zuulv3