Merge branch 'develop'
Merge https://github.com/fredericky/45eb9e92911a4f into develop
Merge branch 'develop' of https://github.com/fredericky/45eb9e92911a4f into develop
fix jackson bug
Merge branch 'develop' of https://github.com/fredericky/45eb9e92911a4f into develop
fix jackson bug