Fixes DOC-704