Merge branch 'mm/status-during-revert'