Merge branch 'bug/JAL-2687concurrentModification' into features/JAL-2608closeOverview