Fix a class scope error
Merge branch 'develop'