[#80155508] Completes 508 Updates