Merge "LongToFp result storage fixed"