Merge branch 'jk/complete-branch-force-delete'