DOC-1175 partial fix (in review)