merge from V1_0_RELEASE