Merge branch 'cedoodev' into test

CeDo

2021-05-21 0da7066cdd4dc8c6ed7b2b5855202d8c0914f33b

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