Fix 32bit size calculation, remove test value.
Merge remote-tracking branch 'lrsjng/develop' into develop