8154817: Fix the click-through navigation for modules

Reviewed-by: jjg, ksrini
8 files changed