Merge "Fix bugs in SimpleIcsWriter"