Ds 1510

This is becoming increasingly munged.  Please delete, with my apologies.

Was:  Pull request for DS-1510