Today
merge from localizebindtoken_error_fix