Ported new v3.1 fixes for #2007 to v3.0.
Merge pull request #2048 from pjackson28/v3.0

Ported new v3.1 fixes for #2007 to v3.0