Merge "Fix crash in ExtServices"