Merge branch 'bug/JAL-3164complementOverview' into merge/JAL-3164