Merge branch 'features/JAL-2608closeOverview' into develop