software update 3.0.7
Merge branch '3.0_update'