v2, v3, integration branch
merge trunk