Merge branch 'feature/allow-servername-override' into develop