Merge branch 'version3.0' into SidneyFan
Optimization

Remove warnings
Remove TODOs
Rearrange constants
Merge branch 'SidneyFan' into version3.0