PR got merged upstream