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