merge dev

2 jobs for filter_by_values in 2 minutes and 43 seconds (queued for 3 seconds)