Request for patch review Derby-1922

[Laura Stewart]

Hi - Can someone please review the patch for Derby-1922?
Also there is one question in the last comment for this issue that
needs to be addressed.

Thanks!
--
Laura Stewart