Scott Lahteine authored 4 years ago

Replaces #17887

Co-Authored-By: Daniel Callander <knifa@users.noreply.github.com>