Merge branch 'ld/git-p4-updates'