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