[509713] Make CGed navigations non-invalid
4 files changed