Merge 'deny-current-branch' into HEAD