v5.5.3956
dc97541a · cherry-pick 856e41ef with resolved conflicts (#64228) ·