Merge branch 'pw/am-rebase-read-author-script'