Merge branch 'js/maint-am-rebase-invalid-author'