Merge branch 'feature/JAL-666_exportoverview' into features/JAL-666_exportoverview