Co-authored-by: sillock1 <jprest97@gmail.com>
(cherry picked from commit d6170dbfedf27a6218afe242a0fae2eb8b368aec)