Merge "Fix crash in bug 4259574"