Merge "Incorrect decoding when TP-OA contains non-integer information"