Merge "Add new satellite error codes" into main