Merge "Workaround unknown ERI indices." into gingerbread