some changes happening in trunk while V2.1 was in test cycles for go live