Merge "Fix segfault with sparse encoding"