The issue described in #26204 should be resolved by this update. It should be backported to all branches currently using 3.4.2.