merge with GE source 4.4.4