718d2801d6ba needs to get into 3.4 to make it work
Pushed to v3-4-test and v3-5-test. Please make sure to pick patches to all open branches to avoid regressions. Closing out bug report. Thanks!