Merge "Use 0xFEFE as the default System code"