Merge branch 'cc/git-packet-pm'