Fixes DOC-860