ESRF-23: Avoid doubling of context path