Merge branch 'js/status-pre-rebase-i'