Merge "Fix integer underflow in ESDS processing" into klp-dev