MOB-131: Updated from Final Filters List
Merge branch 'develop' into feat/MOB-91#notifications
MOB-131: Minor tweaks
Merge branch 'develop' into feat/MOB-91#notifications