Merge branch 'master' into 'sb-subscription-client'

# Conflicts:
#   pom.xml
2 jobs for !43 with sb-subscription-client in 14 minutes and 10 seconds (queued for 4 seconds)
merge request