Co-Authored-By: Jeffrey Morgan <jmorganca@gmail.com> (cherry picked from commit e8ca2ff4e522f2d971801a537b3c4fdfecde0711)