re #10666 improve formatting on windows
Merge branch 'feature/10666_Improve_first_time_dialog' into develop