Fixing DOC-802
Fixing DOC-803