Merge "An extra is being written as one type and read as the wrong type." into ics-factoryrom