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