fixed a compile error due to the previous merge
Merge branch 'develop'