Merge "SO refactor - extract private method from getResourceListFromUserParams Issue...