merged from sebaslv/related-docs