Version 3.0.0.9 tweak
Merge Version 3.0.0.9 to public