Merge "Fix more options crash" into main