Merge branch 'bug/JAL-3085_avoid_414_error_for_PDBFTS' into develop