merged developjava7 branch