#24918: merge with 3.5.