Today
Merge from inputfield_rtl_fix