Merge branch 'jc/apply-reject-noop-hunk' into next