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