Merge "Aligning ESR REST interface"