Merge "Modify error codes and improve descriptions" into sc-dev