Merge branch 'master' into 'ce-upstream'

# Conflicts:
#   doc/api/v3_to_v4.md
50 jobs for ce-upstream in 138 minutes and 35 seconds (queued for 29 seconds)