Merge "FP2-1778: Revert TP setting value to short" into fp2-dev-v2