DOC-1248: Addresses Marten’s concerns on issue #5, #6 and #7.
DOC-1248: Addresses Marten’s concerns for issue #10