Fixes DOC-907