Merge branch 'bug/JAL-2864nullOverviewCanvas' into develop