Merge branch 'feature/filtering-with-fallbacks' into develop