Merge branch 'bug/JAL-2421overviewboxflicker' into develop