Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'