[DBAL-453] Trim search parth entries.
Merge branch 'DBAL-453' into 2.3