Merge "Replace redundant error code with a specific one"