Merge "Fix integer underflow in ESDS processing"