Fixed Trimming
Merge branch 'hotfix/3.9.56.2'