[#112305] Changes to fix routing