[#51278267] was working in the wrong branch, here's the cherry pick to the responsive branch