integrate 1.0.5 RC5