Remove baseUri parameter; it's used for rewriting
Merge branch 'mbst-9478-sitemap-improvements' into stage