Merge branch 'js/rebase-i-label-shown-in-status-fix'