merge from Beta3