Fixes DOC-1390