Wow, huge bug I didn't notice before!
Merge branch 'hotfix/2.2.4.2'