Damien Murphy re discussion points, they were generated as a result of the changes in this pr.
They can be resolved elsewhere or in the follow on pr based on discussion. Just wanting to make sure we have the discussion so they are addressed somewhere.