Merging with changes on 3.9.x