Merge "Fix some bugs for the create flow"