Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !29

(cherry picked from commit 08db7893)

fb6caff3 Merge branch 'feature/099_customer_filter' into 'dev'