[TASK] Updated version and did some code style cleanup.

[skip ci]
Merge remote-tracking branch 'origin/develop' into develop