manual merge from developemnt branch