ISPN-3556

This is my understanding of the problem described in ISPN-3556.  This PR is for the 5.2.x branch because this is the most inline with the commercial product.