Merge "Do not transform again on crash"