some warning fixed for 32-bit
Merge remote-tracking branch 'origin/Long-TC' into Short-TC