UPD: #1225 for DocsModule + small fixes