diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch
index 6f15ee687de..3d1efac2582 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch	
+++ b/java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889, Polar & Wind estimation Import from 8888).launch	
@@ -1,285 +1,280 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/target"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="false"/>
-<intAttribute key="default_start_level" value="4"/>
-<setAttribute key="deselected_workspace_bundles"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djetty.port=8889 -Dreplication.exchangeName=sapsailinganalytics-replica -Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2011 -Xmx6000m -XX:+UseG1GC -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Dhttps.proxyHost=proxy -Dhttps.proxyPort=8080 -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -XX:+UseMembar -Dmongo.dbName=replica -Dpolardata.source.url=http://127.0.0.1:8888 -Dwindestimation.source.url=http://127.0.0.1:8888 -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<setAttribute key="selected_target_bundles">
-<setEntry value="routeconverter@default:default"/>
-<setEntry value="org.apache.commons.codec@default:default"/>
-<setEntry value="org.apache.poi@default:default"/>
-<setEntry value="org.apache.poi.ooxml@default:default"/>
-<setEntry value="org.apache.poi.ooxml.schemas@default:default"/>
-<setEntry value="org.apache.commons.collections4@default:default"/>
-<setEntry value="org.apache.commons.compress@default:default"/>
-<setEntry value="org.apache.poi.source@default:default"/>
-<setEntry value="org.apache.poi.ooxml.source@default:default"/>
-<setEntry value="org.apache.commons.collections4.source@default:default"/>
-<setEntry value="org.apache.commons.compress.source@default:default"/>
-<setEntry value="org.dom4j@default:default"/>
-<setEntry value="org.apache.xmlbeans@default:default"/>
-<setEntry value="org.apache.commons.math@default:default"/>
-<setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
-<setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
-<setEntry value="org.objectweb.asm@default:default"/>
-<setEntry value="org.hyperic.sigar@default:default"/>
-<setEntry value="com.sun.jersey.contribs.jersey-multipart@default:default"/>
-<setEntry value="javax.validation@default:default"/>
-<setEntry value="org.apache.commons.fileupload@default:default"/>
-<setEntry value="org.jvnet.mimepull@default:default"/>
-<setEntry value="org.apache.commons.math3@default:default"/>
-<setEntry value="org.mongodb.driver-core@default:default"/>
-<setEntry value="org.mongodb.driver-core.source@default:default"/>
-<setEntry value="org.mongodb.bson@default:default"/>
-<setEntry value="org.mongodb.bson.source@default:default"/>
-<setEntry value="org.mongodb.driver-sync@default:default"/>
-<setEntry value="org.mongodb.driver-sync@default:default"/>
-<setEntry value="org.eclipse.jetty.osgi.boot@3:true"/>
-<setEntry value="org.eclipse.jetty.osgi.boot.warurl@default:default"/>
-<setEntry value="org.hyperic.sigar@default:default"/>
-<setEntry value="slf4j.jdk14@default:default"/>
-<setEntry value="lz4-java@default:default"/>
-<setEntry value="org.apache.felix.gogo.command@default:default"/>
-<setEntry value="org.apache.felix.gogo.runtime@default:default"/>
-<setEntry value="org.apache.felix.gogo.shell@default:default"/>
-<setEntry value="org.eclipse.jetty.deploy@default:default"/>
-<setEntry value="org.eclipse.jetty.deploy.source@default:default"/>
-<setEntry value="org.eclipse.jetty.http@3:true"/>
-<setEntry value="org.eclipse.jetty.http.source@default:default"/>
-<setEntry value="org.eclipse.jetty.io@default:default"/>
-<setEntry value="org.eclipse.jetty.io.source@default:default"/>
-<setEntry value="org.eclipse.jetty.jmx@default:default"/>
-<setEntry value="org.eclipse.jetty.jmx.source@default:default"/>
-<setEntry value="org.eclipse.jetty.security@default:default"/>
-<setEntry value="org.eclipse.jetty.security.source@default:default"/>
-<setEntry value="org.eclipse.jetty.server@default:default"/>
-<setEntry value="org.eclipse.jetty.server.source@default:default"/>
-<setEntry value="org.eclipse.jetty.servlet@default:default"/>
-<setEntry value="org.eclipse.jetty.servlet.source@default:default"/>
-<setEntry value="org.eclipse.jetty.util@default:default"/>
-<setEntry value="org.eclipse.jetty.util.source@default:default"/>
-<setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
-<setEntry value="org.eclipse.jetty.util.ajax.source@default:default"/>
-<setEntry value="org.eclipse.jetty.webapp@default:default"/>
-<setEntry value="org.eclipse.jetty.webapp.source@default:default"/>
-<setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
-<setEntry value="org.eclipse.jetty.websocket.api.source@default:default"/>
-<setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
-<setEntry value="org.eclipse.jetty.websocket.client.source@default:default"/>
-<setEntry value="org.eclipse.jetty.websocket.common@default:default"/>
-<setEntry value="org.eclipse.jetty.websocket.common.source@default:default"/>
-<setEntry value="org.eclipse.jetty.xml@default:default"/>
-<setEntry value="org.eclipse.jetty.xml.source@default:default"/>
-<setEntry value="slf4j.api@default:default"/>
-<setEntry value="org.apache.servicemix.bundles.zxing@default:default"/>
-<setEntry value="org.apache.commons.io@default:default"/>
-<setEntry value="jcl.over.slf4j@default:default"/>
-<setEntry value="com.sun.mail.javax.mail@default:default"/>
-<setEntry value="com.rabbitmq.client@default:default"/>
-<setEntry value="com.rabbitmq.client.source@default:default"/>
-<setEntry value="org.apache.commons.lang@default:default"/>
-<setEntry value="org.apache.commons.logging@default:default"/>
-<setEntry value="jackson-jaxrs@default:default"/>
-<setEntry value="com.sun.jersey@default:default"/>
-<setEntry value="javax.ws.rs@default:default"/>
-<setEntry value="org.apache.commons.beanutils@default:default"/>
-<setEntry value="org.apache.commons.beanutils.source@default:default"/>
-<setEntry value="org.apache.servicemix.bundles.ehcache@default:default"/>
-<setEntry value="org.apache.servicemix.bundles.scribe@default:default"/>
-<setEntry value="org.owasp.encoder@default:default"/>
-<setEntry value="org.owasp.encoder.source@default:default"/>
-<setEntry value="org.apache.shiro.core@default:default"/>
-<setEntry value="org.apache.shiro.core.source@default:default"/>
-<setEntry value="org.apache.shiro.ehcache@default:default"/>
-<setEntry value="org.apache.shiro.ehcache.source@default:default"/>
-<setEntry value="org.apache.shiro.web@default:default"/>
-<setEntry value="org.apache.shiro.web.source@default:default"/>
-<setEntry value="jackson-core-asl@default:default"/>
-<setEntry value="jackson-mapper-asl@default:default"/>
-<setEntry value="org.apache.commons.collections@default:default"/>
-<setEntry value="org.eclipse.jetty.client@default:default"/>
-<setEntry value="javax.xml@default:default"/>
-<setEntry value="com.sun.activation.javax.activation@default:default"/>
-<setEntry value="org.eclipse.equinox.common@2:true"/>
-<setEntry value="org.eclipse.equinox.console@default:default"/>
-<setEntry value="org.eclipse.equinox.launcher@default:default"/>
-<setEntry value="org.eclipse.equinox.simpleconfigurator@2:true"/>
-<setEntry value="org.eclipse.osgi@-1:true"/>
-<setEntry value="org.eclipse.osgi.services@default:default"/>
-<setEntry value="org.eclipse.equinox.cm@default:default"/>
-<setEntry value="com.sun.istack.commons-runtime@default:default"/>
-<setEntry value="jaxb-api@default:default"/>
-<setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/>
-<setEntry value="javax.xml.stream@default:default"/>
-<setEntry value="javax.xml.ws@default:default"/>
-<setEntry value="org.eclipse.osgi.util@default:default"/>
-<setEntry value="com.chargebee.chargebee-java@default:default"/>
-<setEntry value="com.jcraft.jsch@default:default"/>
-<setEntry value="com.amazon.aws.aws-java-api@default:default"/>
-<setEntry value="com.amazon.aws.aws-java-api.source@default:default"/>
-<setEntry value="org.objectweb.asm@default:default"/>
-<setEntry value="org.objectweb.asm.commons@default:default"/>
-<setEntry value="org.objectweb.asm.tree@default:default"/>
-<setEntry value="org.eclipse.jetty.apache-jsp@4:true"/>
-<setEntry value="org.eclipse.jetty.apache-jsp.source@default:default"/>
-<setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:default"/>
-<setEntry value="org.eclipse.jetty.osgi.boot.jsp.source@default:default"/>
-<setEntry value="org.apache.geronimo.specs.geronimo-jta_1.1_spec@default:default"/>
-<setEntry value="org.apache.aries.spifly.dynamic.bundle@3:true"/>
-<setEntry value="org.mortbay.jasper.apache-el@default:default"/>
-<setEntry value="org.mortbay.jasper.apache-jsp@default:default"/>
-<setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
-<setEntry value="org.apache.taglibs.standard-impl@default:default"/>
-<setEntry value="org.apache.taglibs.taglibs-standard-spec@default:default"/>
-<setEntry value="javax.annotation@default:default"/>
-<setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/>
-<setEntry value="org.apache.xalan@default:default"/>
-<setEntry value="org.apache.xml.serializer@default:default"/>
-<setEntry value="org.eclipse.equinox.event@default:default"/>
-<setEntry value="org.eclipse.jetty.annotations@4:true"/>
-<setEntry value="org.eclipse.jetty.jndi@default:default"/>
-<setEntry value="org.eclipse.jetty.plus@default:default"/>
-<setEntry value="com.sap.db.jdbc@default:default"/>
-<setEntry value="com.sap.db.jdbc.source@default:default"/>
-<setEntry value="org.osgi.service.packageadmin@default:default"/>
-<setEntry value="org.osgi.service.url@default:default"/>
-</setAttribute>
-<setAttribute key="selected_workspace_bundles">
-<setEntry value="com.sap.sailing.geocoding@default:default"/>
-<setEntry value="com.sap.sailing.domain.common@default:default"/>
-<setEntry value="com.sap.sailing.domain@default:default"/>
-<setEntry value="com.sap.sailing.news@4:true"/>
-<setEntry value="com.sap.sailing.domain.tractracadapter@5:true"/>
-<setEntry value="com.sap.sailing.expeditionconnector@default:default"/>
-<setEntry value="com.sap.sailing.domain.windfinderadapter@4:true"/>
-<setEntry value="com.sap.sailing.server@5:true"/>
-<setEntry value="com.sap.sailing.server.gateway@5:true"/>
-<setEntry value="com.sap.sailing.server.gateway.interfaces@default:default"/>
-<setEntry value="com.tractrac.clientmodule@default:default"/>
-<setEntry value="com.sap.sailing.declination@default:default"/>
-<setEntry value="com.sap.sailing.domain.persistence@default:default"/>
-<setEntry value="com.sap.sailing.domain.swisstimingadapter@5:true"/>
-<setEntry value="com.sap.sailing.domain.swisstimingadapter.persistence@4:true"/>
-<setEntry value="com.sap.sailing.domain.swisstimingreplayadapter@4:true"/>
-<setEntry value="com.sap.sailing.domain.tractracadapter.persistence@4:true"/>
-<setEntry value="com.sap.sailing.gwt.ui@6:true"/>
-<setEntry value="com.sap.sailing.udpconnector@default:default"/>
-<setEntry value="com.sap.sailing.simulator@default:default"/>
-<setEntry value="com.sap.sailing.www@5:true"/>
-<setEntry value="com.sap.sailing.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.kiworesultimport@4:true"/>
-<setEntry value="com.sap.sailing.ess40.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.freg.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.barbados.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.sailwave.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.manage2sail.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.sailti.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.yachtscoring.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.velum.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.monitoring@7:true"/>
-<setEntry value="com.sap.sailing.xrr.resultimport@4:true"/>
-<setEntry value="com.sap.sailing.domain.igtimiadapter@4:true"/>
-<setEntry value="com.sap.sailing.domain.igtimiadapter.persistence@default:default"/>
-<setEntry value="com.sap.sailing.domain.racelogtrackingadapter@4:true"/>
-<setEntry value="com.sap.sailing.domain.deckmanadapter@5:true"/>
-<setEntry value="com.sap.sailing.domain.oceanraceadapter@5:true"/>
-<setEntry value="com.sap.sailing.domain.yellowbrickadapter@5:true"/>
-<setEntry value="com.sap.sailing.domain.yellowbrickadapter.persistence@4:true"/>
-<setEntry value="com.sap.sailing.xrr.structureimport@default:default"/>
-<setEntry value="com.sap.sailing.server.gateway.serialization.shared.android@default:default"/>
-<setEntry value="com.sap.sailing.server.gateway.serialization@default:default"/>
-<setEntry value="com.sap.sailing.dashboards.gwt@6:true"/>
-<setEntry value="com.sap.sailing.dashboards.gwt@6:true"/>
-<setEntry value="com.sap.sailing.datamining@5:true"/>
-<setEntry value="com.sap.sailing.datamining.shared@default:default"/>
-<setEntry value="com.sap.sailing.polars@5:true"/>
-<setEntry value="com.sap.sailing.windestimation@5:true"/>
-<setEntry value="com.sap.sailing.polars.datamining@5:true"/>
-<setEntry value="com.sap.sailing.domain.shared.android@default:default"/>
-<setEntry value="com.sap.sailing.manage2sail@default:default"/>
-<setEntry value="com.sap.sailing.polars.datamining.shared@default:default"/>
-<setEntry value="com.sap.sailing.xrr.schema@default:default"/>
-<setEntry value="com.sap.sailing.server.trackfiles@default:default"/>
-<setEntry value="com.sap.sailing.competitorimport@default:default"/>
-<setEntry value="com.sap.sailing.datamining.provider@default:default"/>
-<setEntry value="com.sap.sailing.grib@default:default"/>
-<setEntry value="com.sap.sailing.nmeaconnector@default:default"/>
-<setEntry value="com.sap.sailing.domain.expeditionadapter@5:true"/>
-<setEntry value="com.sap.sailing.expeditionconnector.persistence@4:true"/>
-<setEntry value="com.sap.sailing.expeditionconnector.common@default:default"/>
-<setEntry value="com.sap.sailing.domain.bravoadapter@5:true"/>
-<setEntry value="net.sf.marineapi@default:default"/>
-<setEntry value="com.sap.sailing.routeconverterjava11extension@default:default"/>
-<setEntry value="com.sap.sailing.server.interface@default:default"/>
-<setEntry value="com.sap.sse.datamining.ui@default:default"/>
-<setEntry value="com.sap.sailing.domain.igtimiadapter.gateway@5:true"/>
-<setEntry value="com.sap.sailing.shared.server@5:true"/>
-<setEntry value="com.sap.sailing.shared.server.gateway@5:true"/>
-<setEntry value="com.sap.sailing.shared.persistence@default:default"/>
-<setEntry value="com.sap.sailing.landscape@default:default"/>
-<setEntry value="com.sap.sailing.landscape.gateway@5:true"/>
-<setEntry value="com.sap.sailing.landscape.common@default:default"/>
-<setEntry value="com.sap.sailing.landscape.ui@default:default"/>
-<setEntry value="com.sap.sailing.hanaexport@5:true"/>
-<setEntry value="com.tractrac.clientmodule@default:default"/>
-<setEntry value="com.sap.sse.gwt@default:default"/>
-<setEntry value="com.google.gwt.servlet@default:default"/>
-<setEntry value="com.sap.sse.security@default:default"/>
-<setEntry value="com.sap.sse.security.ui@6:true"/>
-<setEntry value="com.sap.sse.security.userstore.mongodb@4:true"/>
-<setEntry value="com.sap.sse@default:default"/>
-<setEntry value="com.sap.sse.common@default:default"/>
-<setEntry value="com.sap.sse.datamining@default:default"/>
-<setEntry value="com.sap.sse.datamining.annotations@default:default"/>
-<setEntry value="com.sap.sse.datamining.shared@default:default"/>
-<setEntry value="com.sap.sse.gwt.adminconsole@default:default"/>
-<setEntry value="com.sap.sse.mongodb@default:default"/>
-<setEntry value="com.sap.sse.operationaltransformation@default:default"/>
-<setEntry value="com.sap.sse.replication@6:true"/>
-<setEntry value="com.sap.sse.filestorage@4:true"/>
-<setEntry value="com.sap.sse.shared.android@default:default"/>
-<setEntry value="com.sap.sse.mail@5:true"/>
-<setEntry value="com.sap.sse.threadmanager@default:default"/>
-<setEntry value="com.sap.sse.security.common@default:default"/>
-<setEntry value="org.json.simple@default:default"/>
-<setEntry value="com.sap.sse.jersey.jaxbdependencyfragment@default:default"/>
-<setEntry value="org.moxieapps.gwt.highcharts@default:default"/>
-<setEntry value="com.googlecode.java-diff-utils@default:default"/>
-<setEntry value="org.mp4parser.isoparser@default:default"/>
-<setEntry value="com.sap.sse.replication.interfaces@default:default"/>
-<setEntry value="com.sap.sse.security.persistence@default:default"/>
-<setEntry value="com.sap.sse.security.interface@default:default"/>
-<setEntry value="com.sap.sse.replication.persistence@default:default"/>
-<setEntry value="com.sap.sse.landscape.common@default:default"/>
-<setEntry value="com.sap.sse.landscape@default:default"/>
-<setEntry value="com.sap.sse.landscape.aws@4:true"/>
-<setEntry value="com.sap.sse.landscape.aws.common@default:default"/>
-<setEntry value="com.sap.sse.landscape.aws.persistence@default:default"/>
-<setEntry value="com.sap.sse.debranding@default:default"/>
-<setEntry value="elemental2@default:default"/>
-</setAttribute>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/target"/>
+    <booleanAttribute key="default" value="true"/>
+    <booleanAttribute key="default_auto_start" value="false"/>
+    <intAttribute key="default_start_level" value="4"/>
+    <setAttribute key="deselected_workspace_bundles"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djetty.port=8889 -Dreplication.exchangeName=sapsailinganalytics-replica -Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2011 -Xmx6000m -XX:+UseG1GC -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Dhttps.proxyHost=proxy -Dhttps.proxyPort=8080 -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -XX:+UseMembar -Dmongo.dbName=replica -Dpolardata.source.url=http://127.0.0.1:8888 -Dwindestimation.source.url=http://127.0.0.1:8888 -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <setAttribute key="selected_target_bundles">
+        <setEntry value="com.amazon.aws.aws-java-api.source"/>
+        <setEntry value="com.amazon.aws.aws-java-api@default:default"/>
+        <setEntry value="com.chargebee.chargebee-java@default:default"/>
+        <setEntry value="com.jcraft.jsch@default:default"/>
+        <setEntry value="com.rabbitmq.client.source"/>
+        <setEntry value="com.rabbitmq.client@default:default"/>
+        <setEntry value="com.sap.db.jdbc.source"/>
+        <setEntry value="com.sap.db.jdbc@default:default"/>
+        <setEntry value="com.sun.activation.javax.activation@default:default"/>
+        <setEntry value="com.sun.istack.commons-runtime@default:default"/>
+        <setEntry value="com.sun.jersey.contribs.jersey-multipart@default:default"/>
+        <setEntry value="com.sun.jersey@default:default"/>
+        <setEntry value="com.sun.mail.javax.mail@default:default"/>
+        <setEntry value="com.sun.xml.bind.jaxb-impl@default:default"/>
+        <setEntry value="jackson-core-asl@default:default"/>
+        <setEntry value="jackson-jaxrs@default:default"/>
+        <setEntry value="jackson-mapper-asl@default:default"/>
+        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="javax.validation@default:default"/>
+        <setEntry value="javax.ws.rs@default:default"/>
+        <setEntry value="javax.xml.stream@default:default"/>
+        <setEntry value="javax.xml.ws@default:default"/>
+        <setEntry value="javax.xml@default:default"/>
+        <setEntry value="jaxb-api@default:default"/>
+        <setEntry value="jcl.over.slf4j@default:default"/>
+        <setEntry value="lz4-java@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@3:true"/>
+        <setEntry value="org.apache.commons.beanutils.source@default:default"/>
+        <setEntry value="org.apache.commons.beanutils@default:default"/>
+        <setEntry value="org.apache.commons.codec@default:default"/>
+        <setEntry value="org.apache.commons.collections4.source"/>
+        <setEntry value="org.apache.commons.collections4@default:default"/>
+        <setEntry value="org.apache.commons.collections@default:default"/>
+        <setEntry value="org.apache.commons.compress.source"/>
+        <setEntry value="org.apache.commons.compress@default:default"/>
+        <setEntry value="org.apache.commons.fileupload@default:default"/>
+        <setEntry value="org.apache.commons.io@default:default"/>
+        <setEntry value="org.apache.commons.lang@default:default"/>
+        <setEntry value="org.apache.commons.logging@default:default"/>
+        <setEntry value="org.apache.commons.math3@default:default"/>
+        <setEntry value="org.apache.commons.math@default:default"/>
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>
+        <setEntry value="org.apache.geronimo.specs.geronimo-jta_1.1_spec@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
+        <setEntry value="org.apache.poi.ooxml.schemas@default:default"/>
+        <setEntry value="org.apache.poi.ooxml.source"/>
+        <setEntry value="org.apache.poi.ooxml@default:default"/>
+        <setEntry value="org.apache.poi.source"/>
+        <setEntry value="org.apache.poi@default:default"/>
+        <setEntry value="org.apache.servicemix.bundles.ehcache@default:default"/>
+        <setEntry value="org.apache.servicemix.bundles.scribe@default:default"/>
+        <setEntry value="org.apache.servicemix.bundles.zxing@default:default"/>
+        <setEntry value="org.apache.shiro.core.source"/>
+        <setEntry value="org.apache.shiro.core@default:default"/>
+        <setEntry value="org.apache.shiro.ehcache.source"/>
+        <setEntry value="org.apache.shiro.ehcache@default:default"/>
+        <setEntry value="org.apache.shiro.web.source"/>
+        <setEntry value="org.apache.shiro.web@default:default"/>
+        <setEntry value="org.apache.taglibs.standard-impl@default:default"/>
+        <setEntry value="org.apache.taglibs.taglibs-standard-spec@default:default"/>
+        <setEntry value="org.apache.xalan@default:default"/>
+        <setEntry value="org.apache.xml.serializer@default:default"/>
+        <setEntry value="org.apache.xmlbeans@default:default"/>
+        <setEntry value="org.dom4j@default:default"/>
+        <setEntry value="org.eclipse.equinox.cm@default:default"/>
+        <setEntry value="org.eclipse.equinox.common@2:true"/>
+        <setEntry value="org.eclipse.equinox.console@default:default"/>
+        <setEntry value="org.eclipse.equinox.event@default:default"/>
+        <setEntry value="org.eclipse.equinox.launcher@default:default"/>
+        <setEntry value="org.eclipse.equinox.simpleconfigurator@2:true"/>
+        <setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
+        <setEntry value="org.eclipse.jetty.annotations@4:true"/>
+        <setEntry value="org.eclipse.jetty.apache-jsp.source"/>
+        <setEntry value="org.eclipse.jetty.apache-jsp@4:true"/>
+        <setEntry value="org.eclipse.jetty.client@default:default"/>
+        <setEntry value="org.eclipse.jetty.deploy.source"/>
+        <setEntry value="org.eclipse.jetty.deploy@default:default"/>
+        <setEntry value="org.eclipse.jetty.http.source"/>
+        <setEntry value="org.eclipse.jetty.http@3:true"/>
+        <setEntry value="org.eclipse.jetty.io.source"/>
+        <setEntry value="org.eclipse.jetty.io@default:default"/>
+        <setEntry value="org.eclipse.jetty.jmx.source"/>
+        <setEntry value="org.eclipse.jetty.jmx@default:default"/>
+        <setEntry value="org.eclipse.jetty.jndi@default:default"/>
+        <setEntry value="org.eclipse.jetty.osgi-servlet-api@default:default"/>
+        <setEntry value="org.eclipse.jetty.osgi.boot.jsp.source"/>
+        <setEntry value="org.eclipse.jetty.osgi.boot.jsp@default:false"/>
+        <setEntry value="org.eclipse.jetty.osgi.boot.warurl@default:default"/>
+        <setEntry value="org.eclipse.jetty.osgi.boot@3:true"/>
+        <setEntry value="org.eclipse.jetty.plus@default:default"/>
+        <setEntry value="org.eclipse.jetty.security.source"/>
+        <setEntry value="org.eclipse.jetty.security@default:default"/>
+        <setEntry value="org.eclipse.jetty.server.source"/>
+        <setEntry value="org.eclipse.jetty.server@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet.source"/>
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
+        <setEntry value="org.eclipse.jetty.util.ajax.source"/>
+        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
+        <setEntry value="org.eclipse.jetty.util.source"/>
+        <setEntry value="org.eclipse.jetty.util@default:default"/>
+        <setEntry value="org.eclipse.jetty.webapp.source"/>
+        <setEntry value="org.eclipse.jetty.webapp@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.api.source"/>
+        <setEntry value="org.eclipse.jetty.websocket.api@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.client.source"/>
+        <setEntry value="org.eclipse.jetty.websocket.client@default:default"/>
+        <setEntry value="org.eclipse.jetty.websocket.common.source"/>
+        <setEntry value="org.eclipse.jetty.websocket.common@default:default"/>
+        <setEntry value="org.eclipse.jetty.xml.source"/>
+        <setEntry value="org.eclipse.jetty.xml@default:default"/>
+        <setEntry value="org.eclipse.osgi.services@default:default"/>
+        <setEntry value="org.eclipse.osgi.util@default:default"/>
+        <setEntry value="org.eclipse.osgi@-1:true"/>
+        <setEntry value="org.hyperic.sigar@default:default"/>
+        <setEntry value="org.jvnet.mimepull@default:default"/>
+        <setEntry value="org.mongodb.bson.source"/>
+        <setEntry value="org.mongodb.bson@default:default"/>
+        <setEntry value="org.mongodb.driver-core.source"/>
+        <setEntry value="org.mongodb.driver-core@default:default"/>
+        <setEntry value="org.mongodb.driver-sync@default:default"/>
+        <setEntry value="org.mortbay.jasper.apache-el@default:default"/>
+        <setEntry value="org.mortbay.jasper.apache-jsp@default:default"/>
+        <setEntry value="org.objectweb.asm.commons@default:default"/>
+        <setEntry value="org.objectweb.asm.tree@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
+        <setEntry value="org.osgi.service.packageadmin@default:default"/>
+        <setEntry value="org.osgi.service.url@default:default"/>
+        <setEntry value="org.owasp.encoder.source"/>
+        <setEntry value="org.owasp.encoder@default:default"/>
+        <setEntry value="routeconverter@default:default"/>
+        <setEntry value="slf4j.api@default:default"/>
+        <setEntry value="slf4j.jdk14@default:false"/>
+    </setAttribute>
+    <setAttribute key="selected_workspace_bundles">
+        <setEntry value="com.google.gwt.servlet@default:default"/>
+        <setEntry value="com.googlecode.java-diff-utils@default:default"/>
+        <setEntry value="com.sap.sailing.barbados.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.competitorimport@default:default"/>
+        <setEntry value="com.sap.sailing.dashboards.gwt@6:true"/>
+        <setEntry value="com.sap.sailing.datamining.provider@default:default"/>
+        <setEntry value="com.sap.sailing.datamining.shared@default:default"/>
+        <setEntry value="com.sap.sailing.datamining@5:true"/>
+        <setEntry value="com.sap.sailing.declination@default:default"/>
+        <setEntry value="com.sap.sailing.domain.bravoadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain.common@default:default"/>
+        <setEntry value="com.sap.sailing.domain.deckmanadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain.expeditionadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain.igtimiadapter.gateway@5:true"/>
+        <setEntry value="com.sap.sailing.domain.igtimiadapter.persistence@default:default"/>
+        <setEntry value="com.sap.sailing.domain.igtimiadapter@4:true"/>
+        <setEntry value="com.sap.sailing.domain.oceanraceadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain.persistence@default:default"/>
+        <setEntry value="com.sap.sailing.domain.racelogtrackingadapter@4:true"/>
+        <setEntry value="com.sap.sailing.domain.shared.android@default:default"/>
+        <setEntry value="com.sap.sailing.domain.swisstimingadapter.persistence@4:true"/>
+        <setEntry value="com.sap.sailing.domain.swisstimingadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain.swisstimingreplayadapter@4:true"/>
+        <setEntry value="com.sap.sailing.domain.tractracadapter.persistence@4:true"/>
+        <setEntry value="com.sap.sailing.domain.tractracadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain.windfinderadapter@4:true"/>
+        <setEntry value="com.sap.sailing.domain.yellowbrickadapter.persistence@4:true"/>
+        <setEntry value="com.sap.sailing.domain.yellowbrickadapter@5:true"/>
+        <setEntry value="com.sap.sailing.domain@default:default"/>
+        <setEntry value="com.sap.sailing.ess40.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.expeditionconnector.common@default:default"/>
+        <setEntry value="com.sap.sailing.expeditionconnector.persistence@4:true"/>
+        <setEntry value="com.sap.sailing.expeditionconnector@default:default"/>
+        <setEntry value="com.sap.sailing.freg.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.geocoding@default:default"/>
+        <setEntry value="com.sap.sailing.grib@default:default"/>
+        <setEntry value="com.sap.sailing.gwt.ui@6:true"/>
+        <setEntry value="com.sap.sailing.hanaexport@5:true"/>
+        <setEntry value="com.sap.sailing.kiworesultimport@4:true"/>
+        <setEntry value="com.sap.sailing.landscape.common@default:default"/>
+        <setEntry value="com.sap.sailing.landscape.gateway@5:true"/>
+        <setEntry value="com.sap.sailing.landscape.ui@default:default"/>
+        <setEntry value="com.sap.sailing.landscape@default:default"/>
+        <setEntry value="com.sap.sailing.manage2sail.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.manage2sail@default:default"/>
+        <setEntry value="com.sap.sailing.monitoring@7:true"/>
+        <setEntry value="com.sap.sailing.news@4:true"/>
+        <setEntry value="com.sap.sailing.nmeaconnector@default:default"/>
+        <setEntry value="com.sap.sailing.polars.datamining.shared@default:default"/>
+        <setEntry value="com.sap.sailing.polars.datamining@5:true"/>
+        <setEntry value="com.sap.sailing.polars@5:true"/>
+        <setEntry value="com.sap.sailing.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.routeconverterjava11extension@default:false"/>
+        <setEntry value="com.sap.sailing.sailti.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.sailwave.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.server.gateway.interfaces@default:default"/>
+        <setEntry value="com.sap.sailing.server.gateway.serialization.shared.android@default:default"/>
+        <setEntry value="com.sap.sailing.server.gateway.serialization@default:default"/>
+        <setEntry value="com.sap.sailing.server.gateway@5:true"/>
+        <setEntry value="com.sap.sailing.server.interface@default:default"/>
+        <setEntry value="com.sap.sailing.server.trackfiles@default:default"/>
+        <setEntry value="com.sap.sailing.server@5:true"/>
+        <setEntry value="com.sap.sailing.shared.persistence@default:default"/>
+        <setEntry value="com.sap.sailing.shared.server.gateway@5:true"/>
+        <setEntry value="com.sap.sailing.shared.server@5:true"/>
+        <setEntry value="com.sap.sailing.simulator@default:default"/>
+        <setEntry value="com.sap.sailing.udpconnector@default:default"/>
+        <setEntry value="com.sap.sailing.velum.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.windestimation@5:true"/>
+        <setEntry value="com.sap.sailing.www@5:true"/>
+        <setEntry value="com.sap.sailing.xrr.resultimport@4:true"/>
+        <setEntry value="com.sap.sailing.xrr.schema@default:default"/>
+        <setEntry value="com.sap.sailing.xrr.structureimport@default:default"/>
+        <setEntry value="com.sap.sailing.yachtscoring.resultimport@4:true"/>
+        <setEntry value="com.sap.sse.common@default:default"/>
+        <setEntry value="com.sap.sse.datamining.annotations@default:default"/>
+        <setEntry value="com.sap.sse.datamining.shared@default:default"/>
+        <setEntry value="com.sap.sse.datamining.ui@default:default"/>
+        <setEntry value="com.sap.sse.datamining@default:default"/>
+        <setEntry value="com.sap.sse.debranding@default:default"/>
+        <setEntry value="com.sap.sse.filestorage@4:true"/>
+        <setEntry value="com.sap.sse.gwt.adminconsole@default:default"/>
+        <setEntry value="com.sap.sse.gwt@default:default"/>
+        <setEntry value="com.sap.sse.jersey.jaxbdependencyfragment@default:false"/>
+        <setEntry value="com.sap.sse.landscape.aws.common@default:default"/>
+        <setEntry value="com.sap.sse.landscape.aws.persistence@default:default"/>
+        <setEntry value="com.sap.sse.landscape.aws@4:true"/>
+        <setEntry value="com.sap.sse.landscape.common@default:default"/>
+        <setEntry value="com.sap.sse.landscape@default:default"/>
+        <setEntry value="com.sap.sse.mail@5:true"/>
+        <setEntry value="com.sap.sse.mongodb@default:default"/>
+        <setEntry value="com.sap.sse.operationaltransformation@default:default"/>
+        <setEntry value="com.sap.sse.replication.interfaces@default:default"/>
+        <setEntry value="com.sap.sse.replication.persistence@default:default"/>
+        <setEntry value="com.sap.sse.replication@6:true"/>
+        <setEntry value="com.sap.sse.security.common@default:default"/>
+        <setEntry value="com.sap.sse.security.interface@default:default"/>
+        <setEntry value="com.sap.sse.security.persistence@default:default"/>
+        <setEntry value="com.sap.sse.security.ui@6:true"/>
+        <setEntry value="com.sap.sse.security.userstore.mongodb@4:true"/>
+        <setEntry value="com.sap.sse.security@default:default"/>
+        <setEntry value="com.sap.sse.shared.android@default:default"/>
+        <setEntry value="com.sap.sse.threadmanager@default:default"/>
+        <setEntry value="com.sap.sse@default:default"/>
+        <setEntry value="com.tractrac.clientmodule@default:default"/>
+        <setEntry value="elemental2@default:default"/>
+        <setEntry value="net.sf.marineapi@default:default"/>
+        <setEntry value="org.json.simple@default:default"/>
+        <setEntry value="org.moxieapps.gwt.highcharts@default:default"/>
+        <setEntry value="org.mp4parser.isoparser@default:default"/>
+    </setAttribute>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
+    <stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
 </launchConfiguration>
diff --git a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/datavisualization/SingleDimensionAggregatesPlottingFrame.java b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/datavisualization/SingleDimensionAggregatesPlottingFrame.java
index eb4abbeae26..8b30f903315 100644
--- a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/datavisualization/SingleDimensionAggregatesPlottingFrame.java
+++ b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/datavisualization/SingleDimensionAggregatesPlottingFrame.java
@@ -176,7 +176,8 @@ public class SingleDimensionAggregatesPlottingFrame extends JFrame {
         dataset.addSeries(q3Series);
         dataset.addSeries(p1Series);
         dataset.addSeries(p99Series);
-        dataset.addSeries(stdSeries);
+        // Uncomment the following to see the standard deviation; it overlaps the zeroMeanStdSeries, so usually we don't want to see it
+        // dataset.addSeries(stdSeries);
         dataset.addSeries(zeroMeanStdSeries);
         return dataset;
     }
diff --git a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/SimpleModelsTrainingPart1.java b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/SimpleModelsTrainingPart1.java
index 3305370a7dc..7dd82446112 100644
--- a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/SimpleModelsTrainingPart1.java
+++ b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/SimpleModelsTrainingPart1.java
@@ -122,7 +122,7 @@ public class SimpleModelsTrainingPart1 {
         LoggingUtil.logInfo("Model training finished. You can upload the generated file to a server instance.");
     }
 
-    private static void enforceMonotonicZeroMeanSigmaGrowth(AggregatedSingleDimensionType dimensionType) throws UnknownHostException, JsonDeserializationException, ParseException {
+    static void enforceMonotonicZeroMeanSigmaGrowth(AggregatedSingleDimensionType dimensionType) throws UnknownHostException, JsonDeserializationException, ParseException {
         final AggregatedSingleDimensionBasedTwdTransitionPersistenceManager persistenceManager = new AggregatedSingleDimensionBasedTwdTransitionPersistenceManager(dimensionType);
         final List<AggregatedSingleDimensionBasedTwdTransition> allAggregatedElements = persistenceManager.getAllElements();
         Collections.sort(allAggregatedElements, (ae1, ae2)->Double.compare(ae1.getDimensionValue(), ae2.getDimensionValue()));
diff --git a/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/ZeroMeanSigmaSmoothening.java b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/ZeroMeanSigmaSmoothening.java
new file mode 100644
index 00000000000..f212dfad6b6
--- /dev/null
+++ b/java/com.sap.sailing.windestimation.lab/src/com/sap/sailing/windestimation/model/ZeroMeanSigmaSmoothening.java
@@ -0,0 +1,15 @@
+package com.sap.sailing.windestimation.model;
+
+import java.net.UnknownHostException;
+
+import org.json.simple.parser.ParseException;
+
+import com.sap.sailing.windestimation.data.persistence.twdtransition.AggregatedSingleDimensionBasedTwdTransitionPersistenceManager.AggregatedSingleDimensionType;
+import com.sap.sse.shared.json.JsonDeserializationException;
+
+public class ZeroMeanSigmaSmoothening {
+    public static void main(String[] args) throws JsonDeserializationException, UnknownHostException, ParseException {
+        SimpleModelsTrainingPart1.enforceMonotonicZeroMeanSigmaGrowth(AggregatedSingleDimensionType.DISTANCE);
+        SimpleModelsTrainingPart1.enforceMonotonicZeroMeanSigmaGrowth(AggregatedSingleDimensionType.DURATION);
+    }
+}
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom0.0To10.0.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom0.0To10.0.clf
index c706c6bb99b..d168301e0a3 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom0.0To10.0.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom0.0To10.0.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom10.0To912.0.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom10.0To912.0.clf
index ff164292d76..71ecc6f642b 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom10.0To912.0.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom10.0To912.0.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom1368.0ToMaximum.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom1368.0ToMaximum.clf
index 449a6411f45..02c6b57e40e 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom1368.0ToMaximum.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom1368.0ToMaximum.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom912.0To1368.0.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom912.0To1368.0.clf
index 9cc7936629b..07dbb46b5b3 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom912.0To1368.0.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDistanceBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DistanceBasedTwdTransitionRegressorFrom912.0To1368.0.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom0.0To1.0.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom0.0To1.0.clf
index ed6d0bdb375..79888948b00 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom0.0To1.0.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom0.0To1.0.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom1.0To140.0.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom1.0To140.0.clf
index 07c2c4d8af1..79dda0de4c1 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom1.0To140.0.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom1.0To140.0.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom140.0To5394.0.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom140.0To5394.0.clf
index bd814a6a48f..9402edb5019 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom140.0To5394.0.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom140.0To5394.0.clf differ
diff --git a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom5394.0ToMaximum.clf b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom5394.0ToMaximum.clf
index 47f2e44ea5d..354ab2ab6b3 100644
Binary files a/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom5394.0ToMaximum.clf and b/java/com.sap.sailing.windestimation.test/resources/trained_wind_estimation_models/SERIALIZATION.modelForDurationBasedTwdDeltaStdRegressor.IncrementalSingleDimensionPolynomialRegressor.DurationBasedTwdTransitionRegressorFrom5394.0ToMaximum.clf differ