update/merge some files with 17db3b4 + GE4.4.2 sources