Merge branch 'master' into 'develop-QM'

# Conflicts:
#   NEWS.md
1 job for develop-QM
in 32 minutes and 58 seconds, using 0 compute credits, and was queued for 18 seconds