d475d6e011
Merge commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda' * commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda': Handle cases where TYPE can be undefined, such as EAS.