Fixes DOC-1072
Fixes DOC-665
Fixes DOC-1192
Fixes DOC-576