Fix from mega branch into polarshield.  Couldn't replicate the issue in this branch, but being safe. v1.62.