fix #SPOI-2156 Installer - Navigation Code Cleanup
fix #SPOI-2156 Installer - Navigation Code Cleanup
Merge pull request #827 from nickholub/u9

fix #SPOI-2156 Installer - Navigation Code Cleanup