818d921bbb
* Refactor use TrimSuffix instead of TrimRight * TrimRight right * has #12990
* Refactor use TrimSuffix instead of TrimRight * TrimRight right * has #12990