Merge pull request #97367 from TaduJR/refactor-code-to-keep-navigation-handling-in-the-UI-components