BZ-13203 Need to pull partner from somewhere other than garden nickname.