Merge branch 'master' into new-api-list-all

# Conflicts:
#	pom.xml
2 jobs for !31 with new-api-list-all in 7 minutes and 29 seconds (queued for 4 seconds)
merge request