Merge "Remove IRPC error handling" into main