Merge "Make IRPC v3 optionally backwards compatible"