Experiment with ifdef-guarded changes to xdr#910
Draft
leighmcculloch wants to merge 3 commits intomainfrom
Draft
Experiment with ifdef-guarded changes to xdr#910leighmcculloch wants to merge 3 commits intomainfrom
leighmcculloch wants to merge 3 commits intomainfrom