Merge "Fix crash in mainline"