Merge branch '518-filter-for-distributions' into 'develop'

Resolve "Filter for distributions"

Closes #518

See merge request !662
10 jobs for develop in 7 minutes and 32 seconds (queued for 3 seconds)