Merge branch 'master' into 'SubX_magic'

# Conflicts:
#   CHANGELOG.md
2 jobs for !10 with SubX_magic in 26 minutes and 55 seconds (queued for 1 second)
latest merge request