(cherry picked from commit d95660d3c78d1ee11a7966d58e78a82a8df01393) Co-authored-by: Mark McDowall <mark@mcdowall.ca>