Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

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