Merge branch 'bug/JAL-3286duplicatePdbQuery' into develop