Yesterday
merge from inputfield_rtl_fix