Merge pull request #96 from ozone-development/feature-mp-integration

Feature mp integration
Re-apply workaround for URL-resource matching