Merge branch 'feature/filterprovider' into develop

Fixes #37 and fixes #85 by convention.