Merge "Support query service resources by modeluuid"