Merge "Implement source position retrieval"