[Update] the log
Merge remote-tracking branch 'origin/develop' into develop