Merge branch 'jk/reset-p-current-head-fix'