Resolve compilation errors after merge from 3.x 422ec745ab94a5c687316c7dcff1bb2efa60d3a8