Merge "Fixes incorrect array type comparison" into sc-dev