Fixes DOC-1164
Fixes DOC-1163