Merge "Refactoring Resource Resolution Service"