Merge branch 'master' into 'noc-1203'

# Conflicts:
#   core/threadpool.py
15 jobs for !3202 with noc-1203 in 23 minutes and 24 seconds (queued for 2 seconds)
merge request