Merge branch 'release_3.5' into develop
Added support for webmaps containing their own filter
Merge branch 'add_webmap_filter_support' into develop
Merge branch 'develop' into release_3.5