merge from EVENTS1 on 20011016