Merge "Return an empty list instead of null." into sc-dev