Issue #3410361 by claudiu.cristea, jonathan1055, lauriii: Fix the deprecation URL for #3356894 and #3372097 (cherry picked from commit f1d04f61)