Merge branch 'release/0.2.24'
Merge branch 'release/0.2.25'
Hotfix: Remove leftover code from testing
Finished hotfix 0.2.25.1.