Merge "refactor: print error codes and func ID"