Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
(cherry picked from commit 558768ff)

Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>