attempt to fix problem reported by Tomas for FABRIC-6
Merge branch '2.0.2' into FABRICTHREE-709