Fixes DOC-952, fixes DOC-1012