Yesterday
merge from isfullyads_nre_fix