Merge "[Bundle] Prevent null dereference and handle null array values" into devel