Merge remote-tracking branch 'remotes/origin/develop'

# Conflicts: # src/main/resources/application-dev.yml
3 jobs from master in 2 minutes 2 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Maven Test
passed #22648
smas_java
maven test

00:57

 
  Docker Build And Push
passed #22649
smas_java
docker build and push

00:49

 
  Deploy
passed #22650
smas_java
deploy

00:15