Merge branch 'jc/receive-deny-current-branch-fix'