Merge branch 'master' into partition-api-list

# Conflicts:
#	pom.xml
1 job for !37 with partition-api-list in 9 minutes and 2 seconds (queued for 3 seconds)
merge request