Merge "Fix error codes 100-127"