Merge branch 'bug/JAL-1748_extend-pdb-query-opt' into develop