Merge "FP2-1575: Fix integer underflow in ESDS processing" into fp2-dev-v2