[#52116285] Address PR