merged changes from v3-2-test