(cherry picked from commit 6a18a9a2c517c7e9a8a1b3490502ad54583bbf62)
Co-authored-by: Jamie McClymont <jamie@kwiius.com>