Fixed bugs
Merge branch 'develop' into develop_nutty_modify_framework_testbugfixed
Merge pull request #4734 from nutty898/develop_nutty_modify_framework_testbugfixed

Fixed bugs