Repair damage done by merging with v4.7.x