Merge "Make CategoryMembershipChangeJob query more readable"