Readding subdomain parsing for replicated site load
Merge branch 'develop' into zjoia