Partial fix for DOC-730