Merge branch 'cn/pull-rebase-message'