Merge branch 'calibration' into 'doc_calib'

# Conflicts:
#   doc/index.rst
5 jobs for doc_calib in 23 minutes and 59 seconds (queued for 7 seconds)