Merge branch 'feature/serverSwitching/#100-server-mordal' into feature/serverSwitching/#101-todayExtension