merge from p700