Merge branch 'bug/JAL-1715_PDB-Search-selection-validation' into Release_2_9_Branch