Merge branch 'aw/git-p4-deletion'