Merge "Return empty array rather than null" into sc-dev