Merge "FP2-1575: Fix comparison sign warnings." into fp2-dev-v2