Tech reviewed fix for DOC-1227
Proposed fix for DOC-969