Fixed Testing Supplies
Merge branch 'hotfix/3.5.2'