It doesn't solve the problem no matter what the settings are, since your patch only preserves CTE when charset is not changed.
It doesn't solve the problem no matter what the settings are, since your patch only preserves CTE when charset is not changed.