Merge "Move last crash to trigger rollback to host side" into sc-dev