Merge branch 'features/JAL-2388OverviewWindow' into develop