[#112470] Changes to fix routing