Merge branch 'feature/filtering-with-fallbacks' into develop
Merge branch 'feature/hide-from-south-option' into develop