manual merge from mangoszero