Merge branch 'pw/rebase-i-author-script-fix'