Merge branch 'bug/JAL-2591overviewupdate' into develop