Merge branch '520-search-problem-with-parcels' into 'master'

Resolve "Search problem with parcels"

Closes #520

See merge request !538
3 jobs for master in 10 minutes and 43 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Test
passed Lint #235569

00:01:29

passed Test #235570

00:03:32

 
  Build
passed Build #235571

00:07:10