Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>
(cherry picked from commit 760b8cf0)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>