Merge "Fix incorrect usage of sparse array" into sc-dev