merged changes from v4-0-test