Merge "Use int array for included and excluded uids"