Updated JavaDoc
Merge branch 'feat/1758-sitemap' into develop