Fixed a little merge issue
Merge branch 'develop' into feature/guide-filter-routing