fix cpplint
Merge branch 'release/refactoring' into develop