Fixes DOC-1392