Resolve #3540247 "Tidy source contexts"

Closes #3540247

Merge request reports

Loading