(cherry picked from commit c6417337812f3578a27f9dc1e44fdad80f557271) Closes #3370
Co-Authored-By: ta264 <ta264@users.noreply.github.com>