This fix should be cherry-picked in another PR to be merged to master before the release.