This update addresses #47994337 : 404 handling