Merge "Clip text correctly Bug #5706056"