Merge branch 'cedoodev' into test

CeDo

2021-05-20 02d0c4d43358e3c034b3964d4cc30f9fed7cc843

1
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip