Security patch!!
Merge branch 'hotfix/1.24.5'