Merge branch 'master' into 'search-storage-client'

# Conflicts:
#   pom.xml
1 job for !27 with search-storage-client in 6 minutes and 40 seconds (queued for 2 seconds)
merge request