Merge "fix controller creation bug type field have the wrong id so caused json parse...