r40 Merge branch version3 to master [ve 3.3.0]