Merge tag 'v2.4.0' into develop

Various fixes and improvements.
Refer to changelog for details.

Author: lindyhopchris

CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
-## Unreleased
+## [2.4.0] - 2022-06-25
 
 ### Added