commit conflicts resolution

Signed-off-by: gling07 <linggang7@gmail.com>
Merge remote-tracking branch 'github/develop' into develop