manual merge from beta