Today
merge from nametag_clipping_fix