37bef2d0b2
(cherry picked from commit ea8aee0432)
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>