Issue-ID: DOC-595