reintegrate the DEV_2-client branch