Merge "Fix to get the full input text in RetrieveSurrounding" into devel/master