Merge "Blind crash fix" into main