Technical Salt - So21811544 - 09/22/2025